New upstream version

  - update symbols file for new ABI
  - update copyright file
  - update ostree-boot packaging: the utilities in /usr/sbin moved to
    /usr/lib/ostree

diff --git a/debian/changelog b/debian/changelog
index 3a54b2d4ca2e3d79d73a7aefb72f1bba56e6a96d..5de8cb7f1ae15fe1ed6c9409f065ea700454f366 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
-ostree (2016.7-2) UNRELEASED; urgency=medium
+ostree (2016.9-1) UNRELEASED; urgency=medium
 
+  * New upstream version
+    - update symbols file for new ABI
+    - update copyright file
+    - update ostree-boot packaging: the utilities in /usr/sbin moved to
+      /usr/lib/ostree
   * Explicitly build-depend on xsltproc, which is directly used
 
  -- Simon McVittie <smcv@debian.org>  Fri, 12 Aug 2016 10:30:01 +0100

diff --git a/debian/copyright b/debian/copyright
index 3a4aed3580df692dc102068d7b574108cfb8b384..369ed33ff306ffb0736e373699be5cef8006b074 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ Files: *
 Copyright:
  © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  © 1999-2000, 2002-2005 Free Software Foundation, Inc.
- © 2010-2015 Red Hat, Inc
+ © 2010-2016 Red Hat, Inc
  © 2011-2016 Colin Walters <walters@verbum.org>
  © 2011 Avery Pennarun
  © 2013 Collabora Ltd.
@@ -30,9 +30,12 @@ License: GNU-permissive
 Files:
  libglnx/glnx-lockfile.*
  libglnx/glnx-fdio.*
+ libglnx/glnx-missing-syscall.h
+ libglnx/glnx-missing.h
 Copyright:
  © 2010-2011 Lennart Poettering
  © 2014-2015 Colin Walters <walters@verbum.org>
+ © 2016 Zbigniew Jędrzejewski-Szmek
 License: LGPL-2.1+
 
 Files:
@@ -42,6 +45,14 @@ Copyright:
  © 2013 Colin Walters <walters@verbum.org>
 License: LGPL-2+ and BSD-3-clause
 
+Files:
+ buildutil/attributes.m4
+Copyright:
+ 2006-2008 Diego Pettenò
+ 2006-2008 xine project
+ 2012 Lucas De Marchi
+License: GPL-2+ with Autoconf exception
+
 Files:
  GNUmakefile
  build-aux/useless-if-before-free
@@ -91,6 +102,41 @@ Comment:
  License version 2 can be found in the file
  '/usr/share/common-licenses/GPL-2'.
 
+License: GPL-2+ with Autoconf exception
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+ .
+ As a special exception, the copyright owners of the
+ macro gives unlimited permission to copy, distribute and modify the
+ configure scripts that are the output of Autoconf when processing the
+ Macro. You need not follow the terms of the GNU General Public
+ License when using or distributing such scripts, even though portions
+ of the text of the Macro appear in them. The GNU General Public
+ License (GPL) does govern all other use of the material that
+ constitutes the Autoconf Macro.
+ .
+ This special exception to the GPL applies to versions of the
+ Autoconf Macro released by this project. When you make and
+ distribute a modified version of the Autoconf Macro, you may extend
+ this special exception to the GPL to apply to your modified version as
+ well.
+Comment:
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ '/usr/share/common-licenses/GPL-2'.
+
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

diff --git a/debian/libostree-1-1.symbols b/debian/libostree-1-1.symbols
index 11e1696eee79edebbd065a87ce60dd8aea9f744f..39b18d76980938b95382e86aaa46f0fed660fc4d 100644 (file)
--- a/debian/libostree-1-1.symbols
+++ b/debian/libostree-1-1.symbols
@@ -26,8 +26,10 @@ libostree-1.so.1 libostree-1-1 #MINVER#
  ostree_bootconfig_parser_write_at@LIBOSTREE_2016.3 2016.4
  ostree_chain_input_stream_get_type@LIBOSTREE_2016.3 2016.4
  ostree_chain_input_stream_new@LIBOSTREE_2016.3 2016.4
+ ostree_checksum_b64_from_bytes@LIBOSTREE_2016.8 2016.8
  ostree_checksum_b64_inplace_from_bytes@LIBOSTREE_2016.3 2016.4
  ostree_checksum_b64_inplace_to_bytes@LIBOSTREE_2016.3 2016.4
+ ostree_checksum_b64_to_bytes@LIBOSTREE_2016.8 2016.8
  ostree_checksum_bytes_peek@LIBOSTREE_2016.3 2016.4
  ostree_checksum_bytes_peek_validate@LIBOSTREE_2016.3 2016.4
  ostree_checksum_file@LIBOSTREE_2016.3 2016.4

diff --git a/debian/ostree-boot.install b/debian/ostree-boot.install
index 7e2f375c1924f2ae3323c2a8540eecfe810a069b..7701a276407c4b72efe49a4c0b36a6a43d805217 100644 (file)
--- a/debian/ostree-boot.install
+++ b/debian/ostree-boot.install
@@ -4,5 +4,5 @@ lib/systemd/system/ostree-prepare-root.service
 lib/systemd/system/ostree-remount.service
 usr/lib/dracut/modules.d/98ostree
 usr/lib/ostree/grub2-15_ostree
-usr/sbin/ostree-prepare-root
-usr/sbin/ostree-remount
+usr/lib/ostree/ostree-prepare-root
+usr/lib/ostree/ostree-remount

diff --git a/debian/rules b/debian/rules
index 5edd70b3f057b90bd75ae48aac06c6ad2db0880f..5636f69401181ccf5317d40558fc690cde9fb932 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -50,8 +50,8 @@ override_dh_install:
        rm -f debian/tmp/lib/systemd/system/ostree-remount.service
        rm -fr debian/tmp/usr/lib/dracut/modules.d/98ostree/
        rm -f debian/tmp/usr/lib/ostree/grub2-15_ostree
-       rm -f debian/tmp/usr/sbin/ostree-prepare-root
-       rm -f debian/tmp/usr/sbin/ostree-remount
+       rm -f debian/tmp/usr/lib/ostree/ostree-prepare-root
+       rm -f debian/tmp/usr/lib/ostree/ostree-remount
        :
        dh_install --fail-missing